Revision: tlacontrib--aba--1.2--patch-67
Archive: aaron.bentley@utoronto.ca--tla-2004
Creator: Aaron Bentley <abentley@panoramicfeedback.com>
Date: Thu Mar  4 12:23:18 EST 2004
Standard-date: 2004-03-04 17:23:18 GMT
Modified-files: aba/commands/merge
New-patches: aaron.bentley@utoronto.ca--tla-2004/tlacontrib--aba--1.2--patch-67
Summary: Prevented merging untouched trees
Keywords: 

There's been some talk that star-merge/replay aren't thing you really want to
do if you've also made other changes.  I can certainly see the argument
for aba merge.
